<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>

<body>
    <h1>01版本</h1>
<<<<<<< HEAD
    <button>支付功能</button>
=======
    <button>购物车</button>
    <button>我感觉我行了</button>
>>>>>>> det
</body>

</html>